*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cd413de587c2491739cd91ade8092bd1eb351c51..61a3ba3b39d5631c9c4e6b1ae903e5f0b15e6474 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-14  Jason Rumney  <jasonr@gnu.org>
+
+       * image.el (image-type): Use image-type-from-file-name (from trunk
+       2007-05-21  Chong Yidong  <cyd@stupidchicken.com>).
+
 2008-01-12  Glenn Morris  <rgm@gnu.org>
 
        * woman.el (woman-parse-numeric-arg): Change handling of `==':